ui: Don't use Clutter.Group

It is deprecated use Clutter.Actor instead.

https://bugzilla.gnome.org/show_bug.cgi?id=694441

diff --git a/js/ui/layout.js b/js/ui/layout.js
index d4192151aebff731fd03b5bc4d0e8679ccd1cdfb..2b96df83dd05e075f3761841c25bf658f61fe1cf 100644 (file)
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -1075,7 +1075,7 @@ const HotCorner = new Lang.Class({
         // multiple times due to an accidental jitter.
         this._entered = false;
 
-        this.actor = new Clutter.Group({ name: 'hot-corner-environs',
+        this.actor = new Clutter.Actor({ name: 'hot-corner-environs',
                                          width: 3,
                                          height: 3,
                                          reactive: true });
@@ -1087,7 +1087,7 @@ const HotCorner = new Lang.Class({
                                                reactive: true });
         this._corner._delegate = this;
 
-        this.actor.add_actor(this._corner);
+        this.actor.add_child(this._corner);
 
         if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL) {
             this._corner.set_position(this.actor.width - this._corner.width, 0);

diff --git a/js/ui/modalDialog.js b/js/ui/modalDialog.js
index 4649d6d50dce621b64abe4c5e9afb5959fe564e8..5c20b085c6a125a2ab31209cf310959ed3dcbc1d 100644 (file)
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@@ -80,7 +80,7 @@ const ModalDialog = new Lang.Class({
             let stack = new Shell.Stack();
             this._backgroundBin.child = stack;
 
-            this._eventBlocker = new Clutter.Group({ reactive: true });
+            this._eventBlocker = new Clutter.Actor({ reactive: true });
             stack.add_actor(this._eventBlocker);
             stack.add_actor(this.dialogLayout);
         } else {

diff --git a/js/ui/panel.js b/js/ui/panel.js
index f24f3a402e9e7dc1dcef233c9c7022d3ae0c3d36..558ce67f267530a57f0da9c87156bcb4a655c124 100644 (file)
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -203,7 +203,7 @@ const TextShadower = new Lang.Class({
             let child = children[i];
             let childBox = new Clutter.ActorBox();
             // The order of the labels here is arbitrary, except
-            // we know the "real" label is at the end because Clutter.Group
+            // we know the "real" label is at the end because Clutter.Actor
             // sorts by Z order
             switch (i) {
                 case 0: // top

diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index 8b8870ea507b2fa3025dd3b055acf7da0d505128..7c1ff095cc73973200dca7017ab5f43e402a9cd8 100644 (file)
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -564,9 +564,9 @@ const WindowManager = new Lang.Class({
 
         let switchData = {};
         this._switchData = switchData;
-        switchData.inGroup = new Clutter.Group();
-        switchData.outGroup = new Clutter.Group();
-        switchData.movingWindowBin = new Clutter.Group();
+        switchData.inGroup = new Clutter.Actor();
+        switchData.outGroup = new Clutter.Actor();
+        switchData.movingWindowBin = new Clutter.Actor();
         switchData.windows = [];
 
         let wgroup = global.window_group;

diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index bf951d08f52da87c562074e2471df55043d35b60..b6c0d223a1af1fb4bc14853098b5f020893eb280 100644 (file)
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -68,15 +68,15 @@ const WindowClone = new Lang.Class({
 
         // The MetaShapedTexture that we clone has a size that includes
         // the invisible border; this is inconvenient; rather than trying
-        // to compensate all over the place we insert a ClutterGroup into
+        // to compensate all over the place we insert a ClutterActor into
         // the hierarchy that is sized to only the visible portion.
-        this.actor = new Clutter.Group({ reactive: true,
+        this.actor = new Clutter.Actor({ reactive: true,
                                          x: this.origX,
                                          y: this.origY,
                                          width: outerRect.width,
                                          height: outerRect.height });
 
-        this.actor.add_actor(this._windowClone);
+        this.actor.add_child(this._windowClone);
 
         this.actor._delegate = this;
 
@@ -814,7 +814,7 @@ const Workspace = new Lang.Class({
 
         this.monitorIndex = monitorIndex;
         this._monitor = Main.layoutManager.monitors[this.monitorIndex];
-        this._windowOverlaysGroup = new Clutter.Group();
+        this._windowOverlaysGroup = new Clutter.Actor();
         // Without this the drop area will be overlapped.
         this._windowOverlaysGroup.set_size(0, 0);
 

diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
index dee24fa3c3ac08533d5a3a7572475c073994942e..aaf2015d38f82c15b11f31399ce568046d0e6585 100644 (file)
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@@ -166,8 +166,8 @@ const WorkspaceThumbnail = new Lang.Class({
                                      style_class: 'workspace-thumbnail' });
         this.actor._delegate = this;
 
-        this._contents = new Clutter.Group();
-        this.actor.add_actor(this._contents);
+        this._contents = new Clutter.Actor();
+        this.actor.add_child(this._contents);
 
         this.actor.connect('destroy', Lang.bind(this, this._onDestroy));